bitkeeper revision 1.1063 (40eee3b3fhJcuCvug_gxZ26ZGxJG6Q)

Merge ssh://srg//auto/groups/xeno/BK/xeno.bk
into equilibrium.research.intel-research.net:/export/scratch/mwilli2/temp/xeno2.bk

diff --cc .rootkeys
Simple merge

diff --cc tools/python/xen/xend/XendClient.py
index f85c462cf581905f4d31d18d9754b106a92998b5,353d01ae71e67260420fdbc2d4eb2081bdb6667c..2c8027dd02576837602d131ae1a9ab5977fec0b4
--- 1/tools/python/xen/xend/XendClient.py
--- 2/tools/python/xen/xend/XendClient.py
+++ b/tools/python/xen/xend/XendClient.py
@@@ -89,13 -79,10 +89,16 @@@ def vneturl(location, root, id='')
  def eventurl(location, root, id=''):
      return urljoin(location, root, 'event/', id)
  
+ def dmesgurl(location, root, id=''):
+     return urljoin(location, root, 'dmesg/', id)
+ 
  def xend_request(url, method, data=None):
 +    """Make a request to xend.
 +
 +    url    xend request url
 +    method http method: POST or GET
 +    data   request argument data (dict)
 +    """
      urlinfo = urlparse.urlparse(url)
      (uproto, ulocation, upath, uparam, uquery, ufrag) = urlinfo
      if DEBUG: print url, urlinfo

diff --cc tools/python/xen/xm/main.py
index 8f0cdb247e3727c2c7c1ccfefe1db5ddf9ddcef8,91b7ad64d365dc6690504768622d808d71807dc2..5874af70ff72573428abcf361782493b31f18e12
--- 1/tools/python/xen/xm/main.py
--- 2/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@@ -487,21 -444,15 +487,31 @@@ class ProgConsole(Prog)
  
  xm.prog(ProgConsole)
  
 +class ProgCall(Prog):
 +    name = "call"
 +    info = "Call xend api functions."
 +
 +    def help (self, args):
 +        print "call fn argss..."
 +        print """
 +        Call a xend HTTP API function. The leading 'xend_' on the function
 +can be omitted. See xen.xend.XendClient for the API functions.
 +"""
 +
 +    def main(self, args):
 +        xend_client_main(args)
 +
 +xm.prog(ProgCall)
 +
+ class ProgDmesg(Prog):
+     group = 'host'
+     name  =  "dmesg"
+     info  = """Print Xen boot output."""
+ 
+     def main(self, args):
+         print server.xend_dmesg()[1]
+ 
+ xm.prog(ProgDmesg)
+ 
  def main(args):
      xm.main(args)